Index: src/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java
===================================================================
--- src/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java	(revision 208897)
+++ src/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java	(working copy)
@@ -68,6 +68,7 @@
  *  work just fine.
  *  
  * @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
+ * @author <a href="mailto:mailmur@yahoo.com">Aki Nieminen</a>
  * @version $Id$
  */
 public class ClasspathResourceLoader extends ResourceLoader
@@ -91,7 +92,7 @@
      * @throws ResourceNotFoundException if template not found
      *         in  classpath.
      */
-    public synchronized InputStream getResourceStream( String name )
+    public InputStream getResourceStream( String name )
         throws ResourceNotFoundException
     {
         InputStream result = null;
Index: src/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java
===================================================================
--- src/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java	(revision 208897)
+++ src/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java	(working copy)
@@ -20,6 +20,8 @@
 
 import java.util.Hashtable;
 import java.util.Vector;
+import java.util.Map;
+import java.util.HashMap;
 
 import org.apache.velocity.util.StringUtils;
 import org.apache.velocity.runtime.resource.Resource;
@@ -54,6 +56,7 @@
  * </p>
  * 
  * @author <a href="mailto:daveb@miceda-data.com">Dave Bryson</a>
+ * @author <a href="mailto:mailmur@yahoo.com">Aki Nieminen</a>
  * @version $Id$
  */
 public class JarResourceLoader extends ResourceLoader
@@ -63,14 +66,14 @@
      * Key = the entry *excluding* plain directories
      * Value = the JAR URL
      */
-    private Hashtable entryDirectory = new Hashtable(559);
+    private Map entryDirectory = new HashMap(559);
     
     /**
      * Maps JAR URLs to the actual JAR
      * Key = the JAR URL
      * Value = the JAR
      */
-    private Hashtable jarfiles = new Hashtable(89);
+    private Map jarfiles = new HashMap(89);
    
     /**
      * Called by Velocity to initialize the loader
@@ -79,6 +82,9 @@
     {
         rsvc.info("JarResourceLoader : initialization starting.");
 
+        // rest of Velocity engine still use legacy Vector 
+        // and Hashtable classes. Classes are implicitly
+        // synchronized even if we don't need it.
         Vector paths = configuration.getVector("path");
 
         /*
@@ -155,7 +161,7 @@
      * Copy all the entries into the entryDirectory
      * It will overwrite any duplicate keys.
      */
-    private synchronized void addEntries( Hashtable entries )
+    private void addEntries( Hashtable entries )
     {
         entryDirectory.putAll( entries );
     }
@@ -169,7 +175,7 @@
      * @throws ResourceNotFoundException if template not found
      *         in the file template path.
      */
-    public synchronized InputStream getResourceStream( String source )
+    public InputStream getResourceStream( String source )
         throws ResourceNotFoundException
     {
         InputStream results = null;
@@ -230,13 +236,3 @@
         return 0;
     }
 }
-
-
-
-
-
-
-
-
-
-
Index: src/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java
===================================================================
--- src/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java	(revision 208897)
+++ src/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java	(working copy)
@@ -22,13 +22,14 @@
 import java.io.BufferedInputStream;
 import java.io.FileNotFoundException;
 
-import java.util.Hashtable;
-import java.util.Vector;
+import java.util.Collections;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.apache.velocity.util.StringUtils;
-
 import org.apache.velocity.runtime.resource.Resource;
-
 import org.apache.velocity.exception.ResourceNotFoundException;
 
 import org.apache.commons.collections.ExtendedProperties;
@@ -37,6 +38,7 @@
  * A loader for templates stored on the file system.
  *
  * @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
+ * @author <a href="mailto:mailmur@yahoo.com">Aki Nieminen</a> 
  * @version $Id$
  */
 public class FileResourceLoader extends ResourceLoader
@@ -44,25 +46,31 @@
     /**
      * The paths to search for templates.
      */
-    private Vector paths = null;
+    private List paths;
 
     /**
      * Used to map the path that a template was found on
      * so that we can properly check the modification
-     * times of the files.
+     * times of the files. This is synchronizedMap
+     * instance.
      */
-    private Hashtable templatePaths = new Hashtable();
+    private Map templatePaths;    
 
     public void init( ExtendedProperties configuration)
     {
         rsvc.info("FileResourceLoader : initialization starting.");
         
-        paths = configuration.getVector("path");
+        paths = new ArrayList();
+        paths.addAll( configuration.getVector("path") );
         
+        /**
+         * Create synchronized map instance
+         */
+        templatePaths = Collections.synchronizedMap(new HashMap());
+        
         /*
          *  lets tell people what paths we will be using
          */
-
         int sz = paths.size();
 
         for( int i=0; i < sz; i++)
@@ -82,7 +90,7 @@
      * @throws ResourceNotFoundException if template not found
      *         in the file template path.
      */
-    public synchronized InputStream getResourceStream(String templateName)
+    public InputStream getResourceStream(String templateName)
         throws ResourceNotFoundException
     {
         /*
@@ -132,8 +140,7 @@
                  * from so that we can check its modification
                  * time.
                  */
-
-                templatePaths.put(templateName, path);
+                templatePaths.put(templateName, path);                    
                 return inputStream;
             }                
         }
Index: build/build.xml
===================================================================
--- build/build.xml	(revision 208897)
+++ build/build.xml	(working copy)
@@ -86,7 +86,7 @@
     
     <echo>
   ****************************************************************************
-  ** 
+  **
   **  Help for Velocity build file
   **
   **  Target         Depends on          Description
@@ -124,6 +124,7 @@
     </echo>
   
   </target>
+
   <!-- =================================================================== -->
   <!-- prints the environment                                              -->
   <!-- =================================================================== -->
@@ -144,7 +145,7 @@
     <tstamp/>
     <filter token="year" value="${year}"/>
     <filter token="version" value="${version}"/>
-    <filter token="date" value="${DSTAMP}"/>        
+    <filter token="date" value="${DSTAMP}"/>
 
     <mkdir dir="${build.dir}"/>
     <mkdir dir="${build.dest}"/>
@@ -153,6 +154,7 @@
     <copy todir="${build.src}" filtering="yes">
       <fileset dir="${src.java.dir}"> 
         <include name="**/*.java"/>
+        <include name="**/META-INF/*.*"/>
       </fileset>
     </copy>
 
@@ -207,16 +209,16 @@
   <!-- Compiles the source directory with the J2EE dependent files         -->
   <!-- =================================================================== -->
   <target name="compile-J2EE" depends="prepare, J2EE-error" if="J2EE.present">
-      
+
     <javac srcdir="${build.src}"
       destdir="${build.dest}"
       debug="${debug}"
       deprecation="${deprecation}"
       optimize="${optimize}">
-      
+
       <classpath refid="classpath"/>
     </javac>
-            
+
     <antcall target="compile-copy"/>
 
   </target>
@@ -244,8 +246,22 @@
       tofile="${build.dest}/${default.texen.properties}"
     />
 
+    <copy todir="${build.dest}/META-INF">
+      <fileset dir="${build.src}/META-INF">
+        <include name="*"/>
+      </fileset>
+    </copy>
+
   </target>
 
+  <!-- this is called by jarXXX targets before jarring a build -->
+  <target name="compile-copy-metainf">
+    <copy todir="${build.dest}/META-INF">
+      <fileset dir="${build.src}/META-INF">
+        <include name="*"/>
+      </fileset>
+    </copy>
+  </target>
 
   <!-- ================================================================ -->
   <!--   Gets the classes we need from Jakarta Commons collections      -->
@@ -278,8 +294,11 @@
  
     <delete dir="${build.dest}/meta-inf" quiet="true"/>
 
-    <jar jarfile="${build.dir}/${project}-dep-${version}.jar">
+    <antcall target="compile-copy-metainf"/>
 
+    <jar jarfile="${build.dir}/${project}-dep-${version}.jar"
+         manifest="${build.dest}/META-INF/MANIFEST.MF" >
+
       <fileset dir="${build.dest}">
         <exclude name="**/package.html"/>
         <exclude name="org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.class"/>
@@ -294,14 +313,17 @@
   <!-- that has no included dependencies                                   -->
   <!-- =================================================================== -->
   <target name="jar" depends="compile">
-         
-    <jar jarfile="${build.dir}/${project}-${version}.jar">
 
+    <antcall target="compile-copy-metainf"/>
+
+    <jar destfile="${build.dir}/${project}-${version}.jar"
+         manifest="${build.dest}/META-INF/MANIFEST.MF" >
+
       <fileset dir="${build.dest}">
         <exclude name="**/package.html"/>
         <exclude name="org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.class"/>
       </fileset>
-     
+
     </jar>
   
   </target>
@@ -312,17 +334,20 @@
   <!--  including Oro and LogKit for convenience                           -->
   <!-- =================================================================== -->
   <target name="jar-J2EE-dep" depends="compile-J2EE, collections-support" if="J2EE.present">
-        
+
     <unzip src="${log.jar}" dest="${build.dest}"/>
     <unzip src="${oro.jar}" dest="${build.dest}"/>
 
     <delete dir="${build.dest}/meta-inf" quiet="true"/>
 
+    <antcall target="compile-copy-metainf"/>
+
     <jar jarfile="${build.dir}/${project}-J2EE-dep-${version}.jar"
-      basedir="${build.dest}"
-      excludes="**/package.html"
+         manifest="${build.dest}/META-INF/MANIFEST.MF"
+         basedir="${build.dest}"
+         excludes="**/package.html"
     />
-  
+
   </target>
 
   <!-- =================================================================== -->
@@ -331,20 +356,26 @@
   <!-- but without built-in dependencies on Oro or Logkit                  -->
   <!-- =================================================================== -->
   <target name="jar-J2EE" depends="compile-J2EE" if="J2EE.present">
-        
+
+    <antcall target="compile-copy-metainf"/>
+
     <jar jarfile="${build.dir}/${project}-J2EE-${version}.jar"
-      basedir="${build.dest}"
-      excludes="**/package.html"
+         manifest="${build.dest}/META-INF/MANIFEST.MF"
+         basedir="${build.dest}"
+         excludes="**/package.html"
     />
-  
+
   </target>
 
   <!-- =================================================================== -->
   <!-- Compiles the source directory and creates a .jar file               -->
   <!-- =================================================================== -->
   <target name="jar-core" depends="compile">
-        
-    <jar compress="true" jarfile="${build.dir}/${project}-core-${version}.jar">
+
+    <antcall target="compile-copy-metainf"/>
+
+    <jar compress="true" jarfile="${build.dir}/${project}-core-${version}.jar"
+         manifest="${build.dest}/META-INF/MANIFEST.MF" >
       <fileset dir="${build.dest}">
         <exclude name="**/package.html"/>
         <exclude name="org/apache/oro/**"/>
@@ -363,7 +394,7 @@
   <!-- Compiles the source directory and creates a .jar file               -->
   <!-- =================================================================== -->
   <target name="jar-util" depends="compile">
-        
+
     <jar jarfile="${build.dir}/${project}-util-${version}.jar">
       <fileset dir="${build.dest}">
         <exclude name="**/package.html"/>
@@ -398,8 +429,9 @@
           depends="prepare"
           description="--> generates the velocity.src.jar file containing source only">
       <jar jarfile="${build.dir}/${final.name}.src.jar"
-          basedir="${build.src}"
-          excludes="**/package.html"/>
+           manifest="${build.src}/META-INF/MANIFEST.MF"
+           basedir="${build.src}"
+           excludes="**/package.html"/>
   </target>
 
   <!-- =================================================================== -->